Damn Visual Merge Tool striking again!