fixed last errors - tests passed
resolved merge conflict