fixed another bad git merge issue (not mine ;) )