remove pics
fix
fix conflicts