Resolving merge conflicts with your brain...