Cleaned_the_master_from_incorrect_code
#218_API with documentation
#218_resolveconflict