fix bug for area
add shelf manage
merge src