Fix merge madness