Fixed merge?