updated documentation
aolved merge conflicts in min files