Fix wrong merge