finishes this merge! by fixing its bugs