fix merge conflicts in forms