merge changes not committed