Tweaked conflict generation. Fixed client-side schedule conflict detection. Added specs