Unmerged confliuct fixed