some problems while merging