Fixed merge error

A few lines did not merge correctly.