learning to reserve merge conflicts
attempting to fix conflicts