Displaying the stuff on load
Resolving merge conflickts