forgot about settings in the merge