corrected merge errors in the layout