Some visitor
This it is
Merge remote-tracking branch 'origin/master'
Resolved merge
Oops, another conflict