fix merge conflicts and get tests passing