Title: Conflict Resultion Solution