conflict resolved x2