Commited to resolve conflict