aravind-j resove merged