Attempting to clear '[file] has unexpectedly changed kind' error by removing and re-adding problem files.