Not all conflicts are bad. Synergy can detect 24 different conflicts, most of which are shown by default. Before you resolve conflicts, be sure to check with your build manager to find out which conflicts must be resolved.