merging minor conflicts