Corrected errors with merge