finalised features merge