My awesome website Adding some remote changes Adding some local changes adding some content to create Adding some more content locally to create merge confict