merge code with Jayson