resolve name confliction
resolve confliction