add conflicts indicator
pull before fat pack