Actually merged changes