Committing
Fixed merge conflicts