Fixed merge conflix