Corrected Merge issues