indent -kr on everything
merge conflict resolution