Merge changes to base repo