removed conflict file
updating readme