minor changes
conflicts resolved
thumbs?