add putty
solve conflit