mag pull ra ko
status icons and image
conflicts checked