Conflict testing
Mouse-bug finally fixed