Corrected errors from Merge