Merge Neo Logic with Master