Fix erroneous merge conflict resolve - reformat and remove extra end