Component form: fix merge error