Commit changes again which are lost from last merge