subtask1 changed
subtask2
subtask some changed
some change 2
Merge remote-tracking branch 'origin/subtask1' into task1
Merge remote-tracking branch 'origin/subtask2' into task1

Conflicts:
	src/com/gleb/test/MainActivity.java