Scott Disick has “amicably resolved” his previous conflict with the Colorado-based rehabilitation center
