#34 corrected findings
#34: merge upon conflict
#34 solved conflict