add css for error message
update error message
fix conflicts