added the part about merge conflicts