fixing merge bugs, my bad