delete lines
conflit README done