merge initial changes