Now properly resolved merge conflict :D