Error merge corrected