Created new test -- master was here
Batman was here
Spider man was here
Fixed merge conflict