fix readme merge error