I am trying to merge my development branch back into the trunk of my repo. Steps I took: Switch to trunk