Removing merge conflicts :fist: