Mass questions

• AngularJS dynamically inject scope or controller
• Resolve merge conflicts on pull using my changes

Mass answers