Fixed merge issue
Fixed yet another freaking merge issue. I miss SVN