Working on user KRA page
resolved conflicts