add content
nothing like merge conflicts with yourself