fixing merge bugs