feature6 tetsing
conflicts resolved22