Fixed all merge issues.