User Summary Completed but some bugs are present
Conflicts resolved