Something about merge conflicts