HOW TO RESOLVE A CONFLICT