fixing tinny bug i introduced
fix conflicts