mc adds a conclusion and other stuff
fixed a conflict