Advanced content tuning

also maybe a shoutout to https://atom.io/packages/merge-conflicts ?