So I am a bit confused here and need some clarification. I can not fully describe all the commits and workflow but it is something like the following picture
On t