latest changes from my whiteboard
fixed conflicts