Active Admin Complete
Merging...