Going Jekyll
Fixing conflics