Fix merge borkage