Removed _site files and added post
Resolve conflicts