remove ref parent
resolve conflict