Fixed layout EAD
Fixed layout/merge conflict EAD