scrolling box and fixes
conflict resolution