Added a test case to check what happens when push finds a conflict