fixed some merging issues

data still not working correctly, needs more work