merge from slre