Fixed merge stuff