find blocks and components
resolve conflicts