four stories with model rspecs
resolve conflicts after merge