Fixed merge conflict.  Probably ruined everything.