Merged changes from multiple branches, RSpec working