Fixed up partially completed merge