Conflict resolved
Conflict resolved
design issue fixed