comming before merge
resolved conflicts after merging branch rebecca