review access modifiers
solve conflicts, merge