Git – Resolve Merge Conflicts
Most of the time, when you end up with conflicts, solution is to either use local copy or remote copy of conflicting file.
Copy and paste this URL into your WordPress site to embed
Copy and paste this code into your site to embed
