https://flnug.com/tech/kathie/how-to-fix-the-umbrella-merge-conflict-in-cold-war/