Your browser does not support the video element. Alabama Barker and her brother Landon Barker have gotten over their disagreement