Compelted Entites for testing purposes
resolving conflicts