removing more redundant stuff + changing name
Merge remote-tracking branch 'origin/master'