Fixed gitingore once again.
Added the Image element.
Fixed conflicts