Solved the merge conflicts, again 😅 Please could someone have a loot a this please?