fixed commited conflicts