Ok. Fixed before or after the merge?