Merge misshap

Fixed merge messup