Test for recurring shift conflicts passed
Added logic to ensure recurring shifts do not collide with future single shifts