Another Merge issue fixed :(