Resolve change conflict