some design edits
merges done
merge conflicts