fix bugs:
merge