I really Rick'd it
Fix the conflict