COnflict fixes