remove serc2jhk.m
fix conflict