more edits
fix merge conflicts