updates which fix merge-y issues