update copy and images
fix merge conflicts