merge smarter, no '.x' extensions