delete hotfix + iss
add iss52 to merge_conflict
add iss52.c to master
merge