Adding more info about merging with conflicts