+: add comment
:+ add other comment
+: add another comment in feature/test_other_feature branch
Merge branch 'develop' into feature/test_other_feature

Conflicts:
	app/controllers/users_controller.rb