fix merge conflicts that caused compiler errors