Replace template on windows
Resolve conflict (Windows)