include added
Conflict solved
fact function