Cannot merge the "anking overhaul for step 1 & 2 " with mac

This is the reasoning why