Resolve conflicts - Stable