Automation suite for merging commits from upstream