Correct conflit in merge