Fix indentation and mergetool
gemrc