fixed readme merge error