fixing wrong merge artifact