merge: enable defaulttoupstream by default