sekhar- resolved conflicts