Update to Apache Server Configs 2.6.0
fixing conflicts