create conflict file git
Merge remote-tracking branch 'origin/master'
"try to solve confict"