Code samples formatted
solved merge conflicts