first markup and styling
resolved conflicts