kiran changes merged