Testing if sherdon can resolve conflicts