You still have merge conflict artifacts in here.