int abc=0, abc2 = 0;
Merge branch 'czebranch' into cze2branch
conflict_start=2, conflict_start2 = 2;
conflict_start = 3, conflict_start2 =3;
Merge branch 'czebranch' into cze2branch, removed conflict_start=2 and conflict_start=2;
retained czebranch's value
Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java
conflict_start = 4, conflict_start2 = 4;
conflict_start = 5, conflict_start2 = 0;
Merge branch 'cze2branch' into czebranch, resolved conflict by choosing
czebranch's value for conflict_start and cze2branch's value for conflict_start2

Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java