Okay fixed the conflicts, pictures kind of working