Added a section to implementation
Fixed merge confict