manage deploy --pre added
merge conflict
wip