commiting changes after merge on sub branch