changes commited
conflict solved