Merged commit