break up data
fix merge conflict