clean up conflict artifacts
pull out specific code from layout