conflict resolution 540 GIFs