committing branch  file wid changes
committing master file with changes resolved