merge trunk (empty): conflict solved before