Remove useless entries
Fix merge conflict
Merge branch 'master' into HEAD