lin-add conflict
lin-merge