Fix merge bugs (2)