completely different thing
Merge remote-tracking branch 'origin/mergeconflict'

Conflicts:
	Lab2PushPull/src/Main.java