conflicts
more conflicts
conflicts resolved
Merge remote-tracking branch 'origin/master'