[1.8.7] Fixes for 1.8.7
[RuboCop] Get create_conflict back to 15 lines