green background
Resolve conflicts