fixing merge issues. it works again. I (mostly) promis