minor updates, committing to merge
fix merge conflicts