resolve the bug
resolved conflict