removed old commented out part
Merge remote-tracking branch 'origin/master'