data parsing
form organization
merge fix