This is Eric's friend forcing a merge conflict