rename me => ME
fixed three conflict
delete me
Merge branch 'master' of https://github.com/noacandice/test