Not needed anymore and was causing confusion
Only do merge when ff