Part of the merge did not happen correctly, which resulted in a compile error