Fix wrong merge from stock