fixing ./idea/misc.xml from merge issues