another commit to cause conflict merge
testing new folder
change text4
changed text4 again
resolved conflics