fixed unmerged line