smaller merge conflicts