confict fixes