Add status to column and merge
resolve conflicting files