fix the bug and merge