revrting merge bugs