Alabama Barker and her brother Landon Barker have gotten over their disagreement