Redirecting from
/2016/11/17/dont-be-scared-of-merge-conflicts.html/
to
/2016/11/17/dont-be-scared-of-merge-conflicts/