merge errors corrected

Head and header merge errors corrected.