fixed merge problems.