add share
resolve conflict