made change 2
change 3
making change 4
Merge branch 'branch1'

Conflicts:
	init.txt
now making change 5
now making change 5
now making change 7
Squashed commit of the following:

commit 94bd8e30e47d70892b8a5e2c0b490098d155a14c
Author: ashish abrol <aabrol@sapient.com>
Date:   Sat Jan 11 20:58:27 2014 +0530

    now making change 7

commit ea7dcb3b413ba3261c184eac81010c09f3c70988
Author: ashish abrol <aabrol@sapient.com>
Date:   Sat Jan 11 20:58:13 2014 +0530

    now making change 5

commit 3530921fa58bbdce578677692754f1092c2ba028
Author: ashish abrol <aabrol@sapient.com>
Date:   Sat Jan 11 20:58:01 2014 +0530

    now making change 5
starting fresh
in synch
change1
change2
change3
Merge branch 'branch1'

Conflicts:
	init.txt
a