Resolve calendar conflict