bug fix version 1.1 for production
resolve conflict
added notes. completed code