Changes 10/20/14
Fix merge conflict