a
s
merge
Delete Makefile.in~
Delete Header~
Header
Update Header
remove
Merge https://github.com/cbywxkj/COptdev
before merge
merge
conflicts on 12.30
merge success