Comments should explain
Trying to remove conflict
Merge remote-tracking branch 'origin/master' into localweb_branch