Cleaned up git leftovers.

Cleaned up git leftovers from merge problems.