Fix merge bugs.