Fix double #slider, #calendar from merge conflicts

Signed-off-by: Alexsander Akers <a2@pandamonia.us>