Make merge props smarter