machine conflicts should be gone now