jindal changes
conflict-resolve
css changes