Remove a useless selector I had already created
Resolve merge conflicts