Add manual resolve after accept auto merge