deleting line not needed
Merge remote-tracking branch 'origin'