Fixed merge build