Fixed CmpA
removed blank lines at end of dis that cause merged conflict