Fix merge screw up (I think, git is still a mistery for me sometimes)