Bad merging. Too much mercurial usage as of late