Resolve conflict of two different shares
Merge branch 'master' of https://github.com/defskies/Interaction