A utility that applies conflicted patches intelligently.
A wiki and content management system that uses HTML 5 technology.
