before pull
merge conflicts resolved
modified from macserver8