Corrected conflicts with Beyond Compare 3