Please visit my website www.ashish-upadhyay.com
git checkout seotweaks git merge -s ours master git checkout master git merge seotweaks