fixed readme merge errors