old commit forgotten
manual merge back on my mac