I do this
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hkust/cse/calendar/Main/Config.java