added fluidpages to conflicts fixes #18