edit info
merge with pull