fixed unmerged problem