test2 push. to check fastforward push
trying to merge with the origin after resolving the conficts