fixed conflicts and pics
more conflicts