Removed file causing problem with rebase