Try to resolve conflict...?