testing merges and pulling using windows GUI