first test using spray testkit
fix merge conflict