adjustments
resolve conflicts