Pause
stop
Merge
Merge branch 'AddTa'

Conflicts:
	.c9/metadata/tab11
	.c9/metadata/workspace/package.json
Try Merge
...
Clean