merge trevor branch