Cleaned up formatting
Default merge tool set