Handled merge conflicts from current state of backbone app and my testing branch