conflict management
added new file