revering old UI
resolve conflicts