fixed form
merged