Merge error and minor spaces