updated deployment version of buildout
resolved conflict