Resolved merge ui

Resolved merged conflict and by pushing here making sure that all of the tests are passing