Fixed now?
Finally fixed this stupid merging bug