removed test file; fixed tip title & merge