compelte file share
fix conflict and merge