fixed merge-mess