Double checking there's no merge conflicts