fixes conflicts