Remove salesforce toolkit from inside the module (using the one in libraries)
Put back conflict changes. Add trivia changes