Fixed merge thing