add party value to database
fix merge conflict