conflict edit for 3.4

Refresh method is back - conflict fixed