everything is working again
fixed some of the merge problems