merge staged changes