Testing confict resolution