[Fix] Remove conflict from merge
Merge branch 'master' of github.com:loranger/comeincontent