This is a merge conflict that was incorrectly resolved. Please fix