Fixed unmerged conflicts