Merging
Changes in locals, except message not founded in select2