Fix merge conflicts not resolved