Cleanup after merge

delete merge conflict markers + bogus file
Merge branch 'master' into ShuyangLingClock

Resolved