AT:Committing changes post merge