commit before pull
conflict
refactored registrations controller