Fix merge hell fuckups