Add git merge demo and add devices table in DB ->yuanzhe