Really fixed the merge issue this time