confict fix