before pulling
conflict commit
trying to fix merge conflict
Merge remote-tracking branch 'origin/josuah'