Removed some lines
conflict1