commit from ravi
resolved conflict by ravi