Commented out earlier changes re YAML syck and gem syck. Also added an if clause to only show merge option to admins