Testing conflicts
Added CMD for setting up P4Merge on windows