Fixed unmerged problem