removed all the changes occured while trying to resolve conflicts
Attach a file by drag & drop or click to upload
