James merge babak ui