Added command to resolve conflicts with a specific feature object Id.