For Justin to fix merge errors