added the parties list
conflect fix