merge form master