Committing changes to complete merge