Force merge conflict