Solved conflits with README