Add new script - resolve conflicts.