Fix merge bugs (3)