repaired merge errors