Fixed unhandled merged conflict