dev document
resolved conflict
Initial code commit