removed fqdn
merging
removed stuff from merge