adjustment after merge