hide sidebar
resolve conflict