hard fix for content
merge and added hot fix
Merge branch 'master' of github.com:bay6/union