fixing merges in master
fixed after merge
added new file test1