Hopefully fixes merge conflicts, and changes holosign color to bright green.