Re-enabling merge for testing