working on fixing merge for Charlie Paull