testing failures
Mortar tests with exceptions
resolved conflicts