create rails repo
resolve conflict