Corrected merge problems