Fixed http proxy merge changes not working without proxy anymore