Fixed merge issues, again