fixing minor merge errors