Changed squashMerge strategy to use the output of diff --name-status to decide how to resolve conflicts