Resolved merge-conflict -> proper