added analyzer :)
merged conflicting layouts