changed file 3
editing file 3
merge the 2 branches