issue fixed
delete extra files
Resolve conflicts