Merge conflicts
Clean up critique and brainstorming