merge from trunk and resolve conflict

-f -u