Rhymix 2.1.17 git update 시 충돌 발생

Rhymix 최신버전 (2.1.17)을 git update 하니 충돌이 발생했습니다.

이전 git 충돌시 HEAD 이런 것들이 표시되었던 것 같은데(여튼 충돌 내용들이 어떤 식으로든 표시되었든 듯), 

해당 파일 image_title_content.html을 보니 충돌 내용은 표시가 되지 않습니다.

<ul class="widgetZineA">
{@$_idx=0}
<!--@foreach($widget_info->content_items as $key => $item)-->
    <li<!--@if($_idx >= $widget_info->list_count)--> style="display:none"<!--@end-->>

        <p class="thumbArea" style="width:{$widget_info->thumbnail_width}px;margin-right:-{$widget_info->thumbnail_width}px;">
            <a href="{$item->getLink()}" class="thumb" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" target="_blank"|cond="$widget_info->new_window">
                <!--@if($item->getThumbnail())-->
                    <img src="{$item->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" />
                <!--@else-->
                    <span class="imgNone">{$lang->none_image}</span>
                <!--@end-->

                <!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
                    <strong class="category">{$item->getCategory()}</strong>
                <!--@end-->
            </a>
        </p>

    <!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->

        <!--@if($widget_info->option_view_arr[$j]=='title')-->
        <p class="titleArea" style="margin-left:{$widget_info->thumbnail_width+20}px;">

            <!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
                <a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}" target="_blank"|cond="$widget_info->new_window"><strong class="board">{$item->getBrowserTitle()}</strong></a>
            <!--@end-->

            <!--@if($widget_info->show_category=='Y' && $item->get('category_srl') )-->
                <a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}" target="_blank"|cond="$widget_info->new_window"><strong class="category">{$item->getCategory()}</strong></a>
            <!--@end-->

            <a href="{$item->getLink()}" class="title" target="_blank"|cond="$widget_info->new_window">{$item->getTitle($widget_info->subject_cut_size)}</a>

            <!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
                <em class="replyNum" title="Replies"><a href="{$item->getLink()}#comment" target="_blank"|cond="$widget_info->new_window">{$item->getCommentCount()}</a></em>
            <!--@end-->

            <!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
                <em class="trackbackNum" title="Trackbacks"><a href="{$item->getLink()}#trackback" target="_blank"|cond="$widget_info->new_window">{$item->getTrackbackCount()}</a></em>
            <!--@end-->

            <!--@if($widget_info->show_icon=='Y')-->
                <span class="icon">{$item->printExtraImages()}</span>
            <!--@end-->

            <!--@if($widget_info->option_view_arr[$j+1]=='regdate')-->
                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
            <!--@end-->
        </p>

        <!--@else if($widget_info->option_view_arr[$j]=='content')-->
        <p class="text" style="margin-left:{$widget_info->thumbnail_width+20}px;">
            {$item->getContent()}
            <!--@if($widget_info->option_view_arr[$j+1]=='regdate')-->
                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
            <!--@end-->
        </p>

        <!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
        <p class="authorArea" style="margin-left:{$widget_info->thumbnail_width+20}px;">
                <a href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}" target="_blank"|cond="$widget_info->new_window">{$item->getNickName($widget_info->nickname_cut_size)}</a>
            <!--@if(isset($widget_info->option_view_arr[$j+1])=='regdate')-->
                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
            <!--@end-->
        </p>
        <!--@end-->

    <!--@end-->
    </li>
{@$_idx++}
<!--@end-->
</ul>

<!--@if($widget_info->page_count > 1 && $widget_info->list_count<$_idx)-->
    <ul class="widgetNavigator">
        <li><button type="button" class="prev" title="{$lang->cmd_prev}" onclick="content_widget_prev(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetZineA'),{$widget_info->list_count})"><span>{$lang->cmd_prev}</span></button></li>
        <li><button type="button" class="next" title="{$lang->cmd_next}" onclick="content_widget_next(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetZineA'),{$widget_info->list_count})"><span>{$lang->cmd_next}</span></button></li>
    </ul>
<!--@end-->

최신 rhymix 소스 파일을 확인해보니 9번 라인에 srcset 태그가 추가되었더라구요.

추가된 내용으로 수정한 후  다시 커밋해주면 될까요?

그리고, 아래 충돌 log의 내용이 어떤 의미인지 궁금합니다.    

CONFLICT (modify/delete): widgets/content/skins/default/image_title_content.html deleted in HEAD and modified in master. Version master of widgets/content/skins/default/image_title_content.html left in tree.
 

감사드립니다.