New world cup local git
Fixing conflict in config/application