Fix merge confilct from before