@mennaamr You left in a merge conflict and misindented the file. Are you using `git commit -n` ? Don't use `git commit -n` anymore. Also at least test run the rails server before committing a merge.