Merge for pre deploy