merge conflicts
add back images