Fixing conflictions