README deleted conflict