rename jekyll
rm welcome post
fixing merge conflictcs