Fixed conflicts

Had to comment out:
app/models/ad.rb, line 8

has_attachment :photos, maximum: 4

It was throwing an error. Everything else looks good!