Adjusted merged changes