Fixes issues caused by merging repos