Fixed conflicts between repos

Fixed conflicts between repositories and pushed changes related to using ``` for code blocks in markdown files..