manually merged maker and body