making example
delete unnecesary files
fixing conflicts