Edited 1st par conclusion
conflict resolution