hope it merged right