merging again
using theirs