made beautiful
merge fix and made json beautiful