change conflict file