misal trianing complete
fixed conflict