fix #50 grouping points by the same time
fix #50 conflict fixed