test 5 - merged in sync window
commiting again