I edit after merge
merge tmp branch