merge with development, clearing conflict in auction params