mereged master and my copy