merge from clovis