Fix merge conflict on spec_helper