Finish merging repo into workspace