use object instead of img for svg
resolve minor merge conflicts