major changes
delete conflict file