fixing missed conflict