merge changes by maschinna