Fix merge bug.