Unified the two branches