preparing for merge with confluence