training and testing routine now available
resolved conflicts