add background to farm field layer
add placeholder for merge
merge conflicts