corrected merge bugs