Cleaned up failed merge.