fixed refresh
adding anything extra before pulling
fixed confilcts