Merge Logic with Master