Setup Ruby Project
Resolve merge confilct