task1 changes
task2 changes
task3 changes
merge task1
changes