test pull conflict