fixed merge conflict aftereffect