@sethvargo fix FC warnings when merging