bug fix for version 1.1 production
 resolve git conflicts
completed code