checking in conflicts