added fix for hang on startup in a bad network environment when connecting to melpa
fix conflicts