mysql insert
commit remaining file
fixed merge issue