Q1
hot fix issue 53
A1
merge and resolve all conflicts