Adding jsonpretty and git-conflicts aliases