aaand finally resolved merge conflicts