Jason broke stuff in merge conflict resolution, we fixed