conflict in g1
added hijacked version