Fix last merge mess