status testing merge with git