manual merger: layout cleaned
manual merge: code cleaned