fixed bad merge compile errors