prompt to resolve conflicts

I'd love to have some eyes on this, especially bf73bbc before merging.