markdown flavored
merge conflict resolved