My last commit had a poorly done merge, this one is working