1af85b47e9f1127fa2e8bb0d40a4dfaa conflicts