minor fix drag after merge