Resolve conflict file