Fix merge

Actually fixed