t -wq
merging