Fixed extra lines added during conflict.