https://cognitivehub.in/android-studio-unable-to-merge-from-svn-branch/