Uploaded to Github
Fixed conflict