Fixing failed merge... or triying it