major update : geeknote
fixed merge