Fix spec require statements
Fix merge conflicts