fixed a ractive issue with a merge?