Replace $conflines parameter with atomic parameters

Signed-off-by: Samuli Seppänen <samuli.seppanen@gmail.com>