add Lands and bug fix users
resolve conflict