conflict changed back