include responsive image replacement in template
resolve merge conflicts