Fixed image conflicts