Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

merging is hard
Merge remote-tracking branch 'origin/master'

what even happened here...
Merge branch 'develop'