fix confilts 2