added text on resolving conflicts to README