Fixes again; so many conflicts
Fixes again; so many conflicts

PyConPune/pune.pycon.org,SaptakS/pune.pycon.org,PyConPune/pune.pycon.org,SaptakS/pune.pycon.org,SaptakS/pune.pycon.org,PyConPune/pune.pycon.org,SaptakS/pune.pycon.org