fix laygarn
merge