Merging to master was hard...