merge conflict fixed and volunteer's age field matches participants