add basic conflicts test