fixed some merge issues, stable now