Fixed incorrect merge