UX post
fixed manually conflicts
update UX