fixed issue_detail.html merge problems