live prototype merge