formatted and code comments
Handle merge conflicts