costsheet styles
Conflicts resolved