fix facepalm merge bugs