Assests not fixed
dfgs
Fixed conflicts