requirments txt update
merge confliect fixed