Now yes, fixing the merge mess