actually fixes conflicts