Working on UI
Resolving conflicts