editing file 3
merge the 2 branches
add changes