No real change trying to deal with git merging issue