Fixing rebase clashes...again...I got it now :D