conflicts resolved
trying to remove local merge conflicts
multiple feature/acceptance tests written
merged acceptance tests