Fixed up some merging errors