more resolving of merge conflicts
AndrewBusch DaltonTapply