MEDIUM / Fixed incorrect merge