pulled test logs view controller
merged conflicts
pulled test logs VC