added mysql keyphrase table and data
fixed conflicts