Properly merged changes