terasology-38-3: removed self-conflict
terasology-devbuild-1102-3