shivraj commit
removed conflicts