adsadas
conflicts fixed
a good strategy??? this might be it