Refresh implemented.
Fix merge conflict