Reformated results to be consistent
Resolved Merge conflicts