fix last commit patch wrong merge