committing changes due to merge