fix: figured out merge issues