Using Jekyll
Resolve conflicts
Tired