Clean status after merge commited and avoid commiting unecessary merge