using GitEye client
I think I'm performing a merge...could be wrong...