Fix unsaved overlapping events not being saved at deletion of other events

Signed-off-by: Diego Gaustein <diego@gaustein.com.ar>
Push up or down, depending on last conflict.
Change message from 'push down' to 'make space'

Signed-off-by: Diego Gaustein <diego@gaustein.com.ar>