Not sure anymore
Merge remote-tracking branch 'origin/master'
Resized an error