output included
resolve conflicts