init ui kit
create README
resolve conflicts