Conflict fix & Readme