merge apps and lines and timer