corrected grammar mistake
merge with conflict (fixed)
Merge remote-tracking branch 'origin/master'