fixed minor merge bugs