fixed last merge errors