Git conflict cleanup. Readme updated with Layer code snippets.