all previous changes commited
merge it all and commit