styling the code snippet
styling the code snippet and fixing conflicts