changed BG image and inserted header image
fixed second conflict
fixed second conflict