Merge remote-tracking branch 'remotes/origin/waste-branch' into branch1
test staged changes
test unstaged file
Merge branch 'branch1' of https://github.com/ArunYokesh/springthreadpool into branch1
test conflict
test conflict
merged change
test
Merge remote-tracking branch 'remotes/origin/waste-branch' into test12
conflict resolving