merging rahul changes