merged changes with error