solve conflict .idea/workspace.xml