Resolve conflicts automatically

Follow