resolve conflicts mannually