fixed conflict in all. added new images