[FIX] Fixed a merge bug.