fixed minor merge errors