remove dist package from code repository
resolve conflict