Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Attempting to remove .idea folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Attempting to remove .idea folder