Fixes conflicts.