Made cd work.
Fixed conflicts.