commiting master bugfix
committing feature bugfix
Conflict resolved