nono merge do to everyone being on different pages