Looks like there is a merge conflict here and on line 182.