added conflict function
Merged last two commits