checkin to branch
checkin file 3
check file1 change to confligt with branch
merge from branch1