Cleanup workspace and membership
Clean merge conflict