Resolved merge-issues ;)