Removed merge tags from faces-config.xml