reverting merge conflicts