changed image background
fix merge errors