with mixed files
Merge remote-tracking branch 'origin/master'
with mixed filess