added changed in ui
resolved conflicts