bc918f99415a4a4dde1fe89804776861 conflicts