fix a bug on merge! function... it now accept as second argument user even if not used + added add label to locale file en