merge conflicts with brandon

fixed some merge conflicts due to damageable changes