resolve some conflicts and thinking about printing for testing