global AMAT
conflicts
Merge branch 'master' of https://github.com/adamggg/glass-noodles