fixed da fuqed up merge problems.