Fix last error of merge