push conflict test