Fixes conflicts