changed file1 in branch apple
new apple file in apple branch
change file1 in master branch
merge with master