fixed confilct