update prompts for clarity
fix merge conflicts