more better handling of error messages
form for editing about
merge conflict