Fix merge problem and bug.