intentionally merge conflicting