Added UI project
Resolved conflict