merged
Changes from the condo
Resolving conflicts