converting to quixoticguitars.com
resolving merge