Changed title
Annoyed
bug fix v1.1 for production
fix
Resolve merge conflict
added notes, completed