image changed of header
conflict removed