modify application form base category
merge conflict