Fixes conflicts errors