Need up-to-date git version
Merging