remove idea
Merge branch 'solved'

Conflicts:
	.idea/workspace.xml