information added from bug1
add information after merge conflict