Fix merge conflict, pass all RSpec tests