implement the mixed workflow
resolve conflicts