images still running slowly
resoolving conflicts