changed conflict resolution, and size of buttons on mobile