Fix merge error from before