Maybe a clean Jekyll state
fixed merge/push/non-fast-forward conflict