file3 merged and changed
another change
yess now i have the changes from master