fix merge conflicts - should now work