[MERGE] merge the branch of the point_of_sale