conflict resolution, writeup