Fixed build conflict