ui changes for resolving a conflict
now able to resolve  a conflict
Fix UI projection issue
Call finish after conflict resolved
get rid of unused code