Fix merge build