explaining the displays
display errors
fix conflicts