minor chnges for conflict removal