testing ui to controller functionality
fix conflicts