remove merg conflicts