Attempted resolving of .idea/misc.xml conflict