https://geshan.com.np/blog/2016/04/3-simple-rules-for-less-or-no-git-conflicts/