Have Britney Spears and Jamie Lynn Spears Finally Made Up?

Have Britney Spears and Jamie Lynn Spears Finally Made Up?