i done it
confilct fixed