corrected merge problems