made mortar more specific
fixed merge conflict