fixed wrong merge