Fixed minor merge errors