commit before merge
Fixed merge conflicts.