prepare for publishing
resolve conflict